Merge from trunk.
authorDavid Engster <dengste@eml.cc>
Thu, 25 Oct 2012 19:11:29 +0000 (21:11 +0200)
committerDavid Engster <dengste@eml.cc>
Thu, 25 Oct 2012 19:11:29 +0000 (21:11 +0200)

Trivial merge